From bec95ed857b66ca2ae79f08b9cf7d8c721772ff1 Mon Sep 17 00:00:00 2001
From: Chad Horohoe <chadh@wikimedia.org>
Date: Tue, 5 Jan 2016 14:13:55 -0800
Subject: [PATCH] Remove WaitForSlave maintenance script

Maxlag param for wfWaitForSlaves has been deprecated.

Change-Id: I61c09266848e248a28510e267e73ff7177d51bc0
---
 RELEASE-NOTES-1.27           |  2 ++
 autoload.php                 |  1 -
 maintenance/waitForSlave.php | 39 ------------------------------------
 3 files changed, 2 insertions(+), 40 deletions(-)
 delete mode 100644 maintenance/waitForSlave.php

diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27
index 1355b4d6b3..b5b5ae6f41 100644
--- a/RELEASE-NOTES-1.27
+++ b/RELEASE-NOTES-1.27
@@ -216,6 +216,8 @@ changes to languages because of Phabricator reports.
 * wfMsgNoTrans() was removed (deprecated since 1.18).
 * Linker::makeImageLink2 was removed (deprecated since 1.20).
 * Title::userIsWatching() was removed (deprecated since 1.20).
+* Removed WaitForSlave maintenance script; use SELECT MASTER_POS_WAIT()
+  database function directly instead.
 
 == Compatibility ==
 
diff --git a/autoload.php b/autoload.php
index 5ccdaec197..49a3faf09f 100644
--- a/autoload.php
+++ b/autoload.php
@@ -1355,7 +1355,6 @@ $wgAutoloadLocalClasses = array(
 	'VirtualRESTService' => __DIR__ . '/includes/libs/virtualrest/VirtualRESTService.php',
 	'VirtualRESTServiceClient' => __DIR__ . '/includes/libs/virtualrest/VirtualRESTServiceClient.php',
 	'WANObjectCache' => __DIR__ . '/includes/libs/objectcache/WANObjectCache.php',
-	'WaitForSlave' => __DIR__ . '/maintenance/waitForSlave.php',
 	'WantedCategoriesPage' => __DIR__ . '/includes/specials/SpecialWantedcategories.php',
 	'WantedFilesPage' => __DIR__ . '/includes/specials/SpecialWantedfiles.php',
 	'WantedPagesPage' => __DIR__ . '/includes/specials/SpecialWantedpages.php',
diff --git a/maintenance/waitForSlave.php b/maintenance/waitForSlave.php
deleted file mode 100644
index 50665ef2fb..0000000000
--- a/maintenance/waitForSlave.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Wait for the slaves to catch up to the master position.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- * http://www.gnu.org/copyleft/gpl.html
- *
- * @file
- * @ingroup Maintenance
- * @see wfWaitForSlaves()
- */
-
-require_once __DIR__ . '/Maintenance.php';
-
-/**
- * Maintenance script to wait for the slaves to catch up to the master position.
- *
- * @ingroup Maintenance
- */
-class WaitForSlave extends Maintenance {
-	public function execute() {
-		wfWaitForSlaves();
-	}
-}
-
-$maintClass = "WaitForSlave";
-require_once RUN_MAINTENANCE_IF_MAIN;
-- 
2.20.1